Backport "A slightly more conservative version of #14218" #18371
+11
−2
We went looking everywhere, but couldn’t find those commits.
Sometimes commits can disappear after a force-push. Head back to the latest changes here.